Propagate error return from elf_xen_parse().
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Thu, 15 Feb 2007 14:25:58 +0000 (14:25 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Thu, 15 Feb 2007 14:25:58 +0000 (14:25 +0000)
From: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
xen/arch/x86/domain_build.c

index 5755eef7181c230bd626c247e09039da23fb57fb..008a10354836e4fc64fca726994ca560396359ce 100644 (file)
@@ -262,13 +262,13 @@ int construct_dom0(struct domain *d,
 
     nr_pages = compute_dom0_nr_pages();
 
-    if (0 != (rc = elf_init(&elf, image_start, image_len)))
+    if ( (rc = elf_init(&elf, image_start, image_len)) != 0 )
         return rc;
 #ifdef VERBOSE
     elf_set_verbose(&elf);
 #endif
     elf_parse_binary(&elf);
-    if (0 != (elf_xen_parse(&elf, &parms)))
+    if ( (rc = elf_xen_parse(&elf, &parms)) != 0 )
         return rc;
 
     /* compatibility check */